bitkeeper revision 1.1472.1.1 (428d02affnTKrsebSylXhws68fWW9w)

[PATCH] qemu.patch

This patch is needed to get the tree to build for QEMU based I/O emulation.

- Run configure before doing make in tools/ioemu
- We now have a single config file for VMX domains (earlier we had a
  bochsrc and xmexample.vmx)

Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/tools/Makefile b/tools/Makefile
index 44f452649ac3a4e4680caf98ea8579ed6a290add..08a045383d5f39ac881144f6e1a91179aecc7b7a 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,6 +19,9 @@ SUBDIRS += pygrub
 
 all: check
        @set -e; for subdir in $(SUBDIRS); do \
+                if [ -f $$subdir/configure ]; then \
+                        (cd $$subdir; ./configure --prefix=$(DESTDIR)/usr) \
+                fi; \
                $(MAKE) -C $$subdir $@; \
        done
 

diff --git a/tools/examples/xmexample.vmx b/tools/examples/xmexample.vmx
index c1984aa60febb3f3d835319a95864f3e328ac057..428c6e39af1b4ca61a4b3aeddc2c3085d654779c 100644 (file)
--- a/tools/examples/xmexample.vmx
+++ b/tools/examples/xmexample.vmx
@@ -75,7 +75,7 @@ root = "/dev/hda1 ro"
 #nfs_root   = '/full/path/to/root/directory'
 
 # Sets runlevel 4.
-extra = "acpi=off 1"
+extra = "acpi=off console=ttyS0 console=tty0 1"
 
 #----------------------------------------------------------------------------
 # Set according to whether you want the domain restarted when it exits.
@@ -89,5 +89,60 @@ extra = "acpi=off 1"
 
 # New stuff
 memmap = '/etc/xen/mem-map.sxp'
-device_model = '/usr/sbin/device-model'
-device_config = '/etc/xen/bochsrc'
+device_model = '/usr/bin/device-model'
+device_config = '/etc/xen/xmexample.vmx'
+
+#============================================================================
+#
+# config item for qemu device model
+# Note: no space between =
+#-----------------------------------------------------------------------------
+# Qemu binary path
+qemubin='/usr/bin/qemu-dm'
+
+#-----------------------------------------------------------------------------
+# Disk image for 
+hda='/var/images/min-el3-i386.img'
+#hdb=
+#hdc=
+#hdd=
+#cdrom=
+
+#-----------------------------------------------------------------------------
+# boot on floppy (a), hard disk (c) or CD-ROM (d) 
+#boot=[a|c|d]
+#-----------------------------------------------------------------------------
+#  write to temporary files instead of disk image files
+#snapshot=1
+
+#----------------------------------------------------------------------------
+# enable SDL library for graphics, default = 0
+sdl=0
+
+#----------------------------------------------------------------------------
+# enable VNC library for graphics, default = 1
+vnc=1
+
+#----------------------------------------------------------------------------
+# no graphics, use serial port
+#nographic=0
+
+
+#-----------------------------------------------------------------------------
+#   enable audio support
+#enable-audio=1
+
+
+#-----------------------------------------------------------------------------
+#    set the real time clock to local time [default=utc]
+#localtime='utc'
+
+
+#-----------------------------------------------------------------------------
+#    start in full screen
+#full-screen=1   
+
+#-----------------------------------------------------------------------------
+#   set the mac address of the first interface
+#macaddr=  
+